OSDN Git Service

android-x86/frameworks-base.git
9 years agoam dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE...
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:54 +0000 (00:08 +0000)]
am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]

9 years agoam e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:47 +0000 (00:08 +0000)]
am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
  Fix RoundRect radius.

9 years agoam 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and...
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:41 +0000 (00:08 +0000)]
am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
  Use right colors for status bar and nav bar.

9 years agoam 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:35 +0000 (00:08 +0000)]
am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev

* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
  Better shadows.

9 years agoam 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:08:28 +0000 (00:08 +0000)]
am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
  Fix layoutlib tests.

9 years agoam cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:02:06 +0000 (00:02 +0000)]
am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit 'cbb4ec78675c8179cdedafba1972ac062844c70a':
  Fix project settings. [DO NOT MERGE]

9 years agoam a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:58 +0000 (00:01 +0000)]
am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
  Fix RoundRect radius.

9 years agoam 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into...
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:53 +0000 (00:01 +0000)]
am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
  Use right colors for status bar and nav bar.

9 years agoam 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:49 +0000 (00:01 +0000)]
am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev

* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
  Better shadows.

9 years agoam a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Wed, 25 Mar 2015 00:01:43 +0000 (00:01 +0000)]
am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
  Fix layoutlib tests.

9 years agoam 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:14 +0000 (23:55 +0000)]
am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit '6f5fac817abee63d9211e8e43646196950c43707':
  Fix project settings. [DO NOT MERGE]

9 years agoam 44fea603: Merge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:10 +0000 (23:55 +0000)]
am 44fea603: Merge "Fix RoundRect radius." into lmp-dev

* commit '44fea60376e4e851b07eb365fd581c5b9404611f':
  Fix RoundRect radius.

9 years agoam 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:06 +0000 (23:55 +0000)]
am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev

* commit '3bd5cbb1f3d837d7799fb4b33b4dda99adbeeeb4':
  Use right colors for status bar and nav bar.

9 years agoam 34751c79: Merge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:55:02 +0000 (23:55 +0000)]
am 34751c79: Merge "Better shadows." into lmp-dev

* commit '34751c79d6696054b19b5fd0e2946c1dbe5bd9bd':
  Better shadows.

9 years agoam 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:54:58 +0000 (23:54 +0000)]
am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '311a0f54ac95a1649474498748fff8327b0c917d':
  Fix layoutlib tests.

9 years agoMerge "Fix project settings. [DO NOT MERGE]" into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:52:17 +0000 (23:52 +0000)]
Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

9 years agoMerge "Fix RoundRect radius." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:48 +0000 (23:51 +0000)]
Merge "Fix RoundRect radius." into lmp-dev

9 years agoMerge "Use right colors for status bar and nav bar." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:29 +0000 (23:51 +0000)]
Merge "Use right colors for status bar and nav bar." into lmp-dev

9 years agoMerge "Better shadows." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:51:10 +0000 (23:51 +0000)]
Merge "Better shadows." into lmp-dev

9 years agoMerge "Fix layoutlib tests." into lmp-dev
Deepanshu Gupta [Tue, 24 Mar 2015 23:50:53 +0000 (23:50 +0000)]
Merge "Fix layoutlib tests." into lmp-dev

9 years agoBetter shadows.
Deepanshu Gupta [Wed, 4 Feb 2015 03:02:15 +0000 (19:02 -0800)]
Better shadows.

Better shadows for rectangles and rounded rectangles (includes circles).

The shadow painting code is mostly from CardView library, but modified
heavily since CardView needs to draw the shadow inside view bounds.

Change-Id: I88c9f19b1c16839b8d6db6df2bebff126fa5a9a3

9 years agoFix RoundRect radius.
Deepanshu Gupta [Tue, 24 Mar 2015 18:34:34 +0000 (11:34 -0700)]
Fix RoundRect radius.

Android APIs use radius for measuring the corner's curvature, but Java2D
APIs use diameter. Add the missing conversion.

Change-Id: I630fc8712e8301324c641885c0c4adf644d13b7e

9 years agoUpdate progress_dialog on watch to use small spinner
Anthony Hugh [Mon, 23 Mar 2015 20:17:35 +0000 (13:17 -0700)]
Update progress_dialog on watch to use small spinner

The new material design theme causes the spinner to give us even
less room on the progress dialog screen.  This is causing cut off
text.

This change adds an alternate layout for the progress_dialog on
watches so that we can use a small spinner to make our text fit
better.

BUG: 18388692
BUG: 16493311
Change-Id: I2537aa2c1ee6329838c9c0c16f511c944fa86050

9 years agoMerge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into...
Anthony Hugh [Mon, 23 Mar 2015 20:15:49 +0000 (20:15 +0000)]
Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev

9 years agoDO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
Adam Lesinski [Thu, 19 Mar 2015 21:37:11 +0000 (14:37 -0700)]
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier

Some UI is displayed (boot/optimizing) before the configuration
has been completely set. This noteably happens for watches and
TVs because UIModeManagerService hasn't started yet.

UIModeManagerService is started earlier, and its dependency
TwilightService is loaded during the "all system services ready"
boot phase.

b/18388692

Change-Id: Iabdf8ac3eb04ebcb44779d752e19042769cc65c6

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Mar 2015 12:38:24 +0000 (05:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I911df3cb6476017bb6723403dbabb2dfbfc4bce2
Auto-generated-cl: translation import

9 years agoUse right colors for status bar and nav bar.
Deepanshu Gupta [Wed, 18 Mar 2015 22:47:54 +0000 (15:47 -0700)]
Use right colors for status bar and nav bar.

Bug: http://b.android.com/81862
Change-Id: Ia10297e83e54c01a50de6cbcac2b7fef48e8d238

9 years agoMerge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev
Griff Hazen [Sat, 21 Mar 2015 23:59:45 +0000 (23:59 +0000)]
Merge "Allow emulator to select a window outset bottom" into lmp-mr1-modular-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 21 Mar 2015 06:15:45 +0000 (23:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: I59ad105e99dbd4c8bd19c4e94eecd6e19425345a
Auto-generated-cl: translation import

9 years agoam d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 22:10:54 +0000 (22:10 +0000)]
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.

9 years agoMerge "Disable more hotkeys while in setup." into lmp-mr1-dev
Jeff Brown [Fri, 20 Mar 2015 22:05:06 +0000 (22:05 +0000)]
Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

9 years agoDisable more hotkeys while in setup.
Jeff Brown [Fri, 20 Mar 2015 01:26:30 +0000 (18:26 -0700)]
Disable more hotkeys while in setup.

Disables fallback key processing for CALL, CAMERA, and HEADSETHOOK
buttons.

Bug: 19767816
Change-Id: I423103c367e05827c939cd8d8dbecb6012b0e9f0

9 years agoam a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightContr...
Zach Riggle [Thu, 19 Mar 2015 23:35:20 +0000 (23:35 +0000)]
am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0':
  Fix NPE in FlashlightController

9 years agoam 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into...
Zach Riggle [Thu, 19 Mar 2015 23:29:06 +0000 (23:29 +0000)]
am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '901e400826e76f0eaa9d05cca20c1696bf86db67':
  Fix NPE in FlashlightController

9 years agoam a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:22:10 +0000 (23:22 +0000)]
am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit 'a6e7a9b50d0866fac57447496e4207d91c68c806':
  Fix NPE in FlashlightController

9 years agoam 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:15:02 +0000 (23:15 +0000)]
am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-dev

* commit '6a5b2110eb0adbf8b9d53cf86a931b6067691f14':
  Fix NPE in FlashlightController

9 years agoMerge "Fix NPE in FlashlightController" into lmp-dev
Zach Riggle [Thu, 19 Mar 2015 23:09:31 +0000 (23:09 +0000)]
Merge "Fix NPE in FlashlightController" into lmp-dev

9 years agoam 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places...
smain@google.com [Thu, 19 Mar 2015 22:48:07 +0000 (22:48 +0000)]
am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '092a7893779455ca9d1a0ff34d9ccefb9ae709db':
  add Places API to the Location feature page

9 years agoam d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the...
smain@google.com [Thu, 19 Mar 2015 22:42:44 +0000 (22:42 +0000)]
am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit 'd5fdc2870079876cd5d8407773aa73225a12c044':
  add Places API to the Location feature page

9 years agoam 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature...
smain@google.com [Thu, 19 Mar 2015 22:35:16 +0000 (22:35 +0000)]
am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '3bc84b18b74cd14d98c81ea263b3ca49549a590c':
  add Places API to the Location feature page

9 years agoam 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into...
smain@google.com [Thu, 19 Mar 2015 22:29:09 +0000 (22:29 +0000)]
am 910ca415: am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '910ca415587c6b7f7a004cc381c36352c021c12b':
  add Places API to the Location feature page

9 years agoam 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:22:10 +0000 (22:22 +0000)]
am 4b53dc8b: Merge "add Places API to the Location feature page" into lmp-docs

* commit '4b53dc8bae0cc3f84e20765ea35ea3eab0371134':
  add Places API to the Location feature page

9 years agoMerge "add Places API to the Location feature page" into lmp-docs
smain@google.com [Thu, 19 Mar 2015 22:16:11 +0000 (22:16 +0000)]
Merge "add Places API to the Location feature page" into lmp-docs

9 years agoMerge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
Bryce Lee [Thu, 19 Mar 2015 21:24:51 +0000 (21:24 +0000)]
Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev

9 years agoam 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT...
Joe Fernandez [Thu, 19 Mar 2015 20:49:52 +0000 (20:49 +0000)]
am 0362d6e0: am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit '0362d6e0c836cd48beb928f053d97dcc3961c110':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT...
Joe Fernandez [Thu, 19 Mar 2015 20:49:48 +0000 (20:49 +0000)]
am e41abf4a: am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'e41abf4a304675bda37de7b796258f7f322d61ea':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT...
Joe Fernandez [Thu, 19 Mar 2015 20:49:41 +0000 (20:49 +0000)]
am d7df900a: am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'd7df900a80f4c7af1f16efc0a8bcf044a2a7ff4d':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change...
Joe Fernandez [Thu, 19 Mar 2015 20:42:36 +0000 (20:42 +0000)]
am bb777ef4: am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'bb777ef40d7a181e782dfce652c3d9da390dc9f5':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated...
Joe Fernandez [Thu, 19 Mar 2015 20:42:30 +0000 (20:42 +0000)]
am 43929db6: am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '43929db6487f295c4bca1a499a5299da77ad2161':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added...
Joe Fernandez [Thu, 19 Mar 2015 20:42:23 +0000 (20:42 +0000)]
am a06c8ff0: am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'a06c8ff08ea783d4e0e3bdb1a46bf6a4a382a58c':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for...
Eric Gilmore [Thu, 19 Mar 2015 20:38:49 +0000 (20:38 +0000)]
am 66e529aa: am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '66e529aa34034d044c496c330ba89026ee293253':
  Changes for a quick, pre-migration bug sprint:

9 years agoam b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for...
Joe Fernandez [Thu, 19 Mar 2015 20:35:09 +0000 (20:35 +0000)]
am b88bce21: am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'b88bce219abf7fcad50ac105183bd79da0b9893c':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s...
Joe Fernandez [Thu, 19 Mar 2015 20:35:05 +0000 (20:35 +0000)]
am f761e4c2: am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'f761e4c20ee63873043522990487ecd15bb18966':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javado...
Joe Fernandez [Thu, 19 Mar 2015 20:34:59 +0000 (20:34 +0000)]
am 36b2c160: am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit '36b2c1609d17317bb9d3977e46ada21275f54d65':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre...
Eric Gilmore [Thu, 19 Mar 2015 20:32:03 +0000 (20:32 +0000)]
am 1f07cfb6: am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '1f07cfb6011e3d30847f0e7012bcef9e93c0fa5f':
  Changes for a quick, pre-migration bug sprint:

9 years agoam c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API...
Joe Fernandez [Thu, 19 Mar 2015 20:28:54 +0000 (20:28 +0000)]
am c773358d: am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'c773358d599d9dd7716db88b0699a7903d64ad9b':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google...
Joe Fernandez [Thu, 19 Mar 2015 20:28:45 +0000 (20:28 +0000)]
am d91167e8: am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit 'd91167e8ceda64809e9afd73ac184dc319a276f5':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google...
Joe Fernandez [Thu, 19 Mar 2015 20:28:40 +0000 (20:28 +0000)]
am bacdd2b8: am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'bacdd2b8dec83679493a95bdcfa5ac80b6cfcb78':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoFix wrong intent being passed in PhoneWindowManager.
Bryce Lee [Thu, 19 Mar 2015 20:27:26 +0000 (13:27 -0700)]
Fix wrong intent being passed in PhoneWindowManager.

When starting going home for Wear, the intent extra indicating the
intent is coming from a button press must be set. This was lost during
a merge conflict resolution.

Bug: 19832892
Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f

9 years agoam 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration...
Eric Gilmore [Thu, 19 Mar 2015 20:24:57 +0000 (20:24 +0000)]
am 0fdeefbd: am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit '0fdeefbdad81e92a5fdb5acc7f92fc92a28654b4':
  Changes for a quick, pre-migration bug sprint:

9 years agoam dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp...
Joe Fernandez [Thu, 19 Mar 2015 20:21:47 +0000 (20:21 +0000)]
am dd461b29: Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

* commit 'dd461b298834d7582a98a69c164fe1e3b63c81b9':
  RESUBMIT: "Doc change: add docs for SafetyNet API.""

9 years agoam 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services...
Joe Fernandez [Thu, 19 Mar 2015 20:21:43 +0000 (20:21 +0000)]
am 80f947c8: Merge "RESUBMIT: "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

* commit '80f947c8b41d732bc1f8ca4c36df11a395dc9248':
  RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

9 years agoam ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play service...
Joe Fernandez [Thu, 19 Mar 2015 20:21:37 +0000 (20:21 +0000)]
am ef7d8081: Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

* commit 'ef7d80811d16462d3cbd9af2319555aa5b6e1f52':
  RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

9 years agoam cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:"...
Eric Gilmore [Thu, 19 Mar 2015 20:17:22 +0000 (20:17 +0000)]
am cf1586d3: am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'cf1586d3fb4e3232aa4f4679eb389bcf89415b15':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 20:16:31 +0000 (20:16 +0000)]
Merge "RESUBMIT: "Doc change: add docs for SafetyNet API.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect...
Joe Fernandez [Thu, 19 Mar 2015 20:16:20 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""" into lmp-docs

9 years agoMerge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla...
Joe Fernandez [Thu, 19 Mar 2015 20:16:03 +0000 (20:16 +0000)]
Merge "RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""" into lmp-docs

9 years agoam e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:10:55 +0000 (20:10 +0000)]
am e43a64e3: Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

* commit 'e43a64e3336548094571885944afc28792e24fa0':
  Changes for a quick, pre-migration bug sprint:

9 years agoMerge "Changes for a quick, pre-migration bug sprint:" into lmp-docs
Eric Gilmore [Thu, 19 Mar 2015 20:05:49 +0000 (20:05 +0000)]
Merge "Changes for a quick, pre-migration bug sprint:" into lmp-docs

9 years agoam e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguar...
Rich Slogar [Thu, 19 Mar 2015 20:02:31 +0000 (20:02 +0000)]
am e3d92a20: am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'e3d92a205b5c1bfde3ceff1fe4ca9a62cc5cb4fc':
  docs: proguard help update

9 years agoam 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update...
Rich Slogar [Thu, 19 Mar 2015 19:54:30 +0000 (19:54 +0000)]
am 983dd1a9: am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit '983dd1a9d1dc5a6d0bc72fcbc87b5194df09c048':
  docs: proguard help update

9 years agoam b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp...
Rich Slogar [Thu, 19 Mar 2015 19:47:03 +0000 (19:47 +0000)]
am b569ec3c: am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'b569ec3cc1366e3e3caa96fa40a9fc14ed9c6121':
  docs: proguard help update

9 years agoam d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:39:27 +0000 (19:39 +0000)]
am d76aa14c: am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'd76aa14cf401ca794b585b2312528121c651a537':
  docs: proguard help update

9 years agoam d5885842: Merge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:10:06 +0000 (19:10 +0000)]
am d5885842: Merge "docs: proguard help update" into lmp-docs

* commit 'd58858427e102bec7ebe1d2a8ce418529924a68c':
  docs: proguard help update

9 years agoMerge "docs: proguard help update" into lmp-docs
Rich Slogar [Thu, 19 Mar 2015 19:04:04 +0000 (19:04 +0000)]
Merge "docs: proguard help update" into lmp-docs

9 years agoam ca0391eb: am c8f952ce: Write correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 18:35:07 +0000 (18:35 +0000)]
am ca0391eb: am c8f952ce: Write correct checksum when formatting partition

* commit 'ca0391eb524b0adad79160c48682c4edf6f49ed2':
  Write correct checksum when formatting partition

9 years agoam c8f952ce: Write correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 18:27:54 +0000 (18:27 +0000)]
am c8f952ce: Write correct checksum when formatting partition

* commit 'c8f952ce9f9cadc0d38745e455c0a6388bc68a47':
  Write correct checksum when formatting partition

9 years agodocs: proguard help update
Rich Slogar [Tue, 3 Mar 2015 20:27:16 +0000 (12:27 -0800)]
docs: proguard help update

b/19383794
b/19417644

Change-Id: I454015fb85601dbd31d3cb364eaa6d0adee0c764

9 years agoWrite correct checksum when formatting partition
Andres Morales [Thu, 19 Mar 2015 15:34:55 +0000 (08:34 -0700)]
Write correct checksum when formatting partition

OEM unlock enabled bit is not computed in the checksum,
causing OEM Unlocking to be disabled after the second
reboot.

Bug: 19829441
Change-Id: I100bf5d3958b89323ee35b9e97b19c162209fcd7

9 years agoRESUBMIT: "Doc change: add docs for SafetyNet API.""
Joe Fernandez [Thu, 19 Mar 2015 16:39:43 +0000 (16:39 +0000)]
RESUBMIT: "Doc change: add docs for SafetyNet API.""

This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0.

Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0

9 years agoRESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes...
Joe Fernandez [Thu, 19 Mar 2015 16:38:05 +0000 (16:38 +0000)]
RESUBMIT: "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.""

This reverts commit 2a867108951807e467dbfe0fcd4cc48a4d7f4191.

Change-Id: Ib91bf437e952e8a91f20afc63332b88952527ca4

9 years agoRESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Gener...
Joe Fernandez [Thu, 19 Mar 2015 16:36:02 +0000 (16:36 +0000)]
RESUBMIT: "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.""

This reverts commit c0e9ac455568b2d82d191388708a281bdb376cc9.

Change-Id: Iccc75ead90c92602b25da70e13bcdd55a6d129b6

9 years agoMerge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev
Vinod Krishnan [Thu, 19 Mar 2015 09:36:36 +0000 (09:36 +0000)]
Merge "Make Theme.Micro point to Theme.Material" into lmp-mr1-modular-dev

9 years agoam ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated...
Joe Fernandez [Thu, 19 Mar 2015 05:52:21 +0000 (05:52 +0000)]
am ebaf7901: am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'ebaf79018b5bcfbe83f5877d5360a1c0d46d0b97':
  docs: updated Auto training landing page

9 years agoam cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto trainin...
Joe Fernandez [Thu, 19 Mar 2015 05:44:33 +0000 (05:44 +0000)]
am cbdfa09f: am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'cbdfa09fc56995c8c99e8684b8c52e4f9d247a50':
  docs: updated Auto training landing page

9 years agoam f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing...
Joe Fernandez [Thu, 19 Mar 2015 05:37:09 +0000 (05:37 +0000)]
am f8b9e92b: am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'f8b9e92b647f247d38e02ed3cf66bdc8cf08bc1c':
  docs: updated Auto training landing page

9 years agoam ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp...
Joe Fernandez [Thu, 19 Mar 2015 05:31:20 +0000 (05:31 +0000)]
am ae454257: am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'ae4542578ef50122bb3cd3a8334a20314957e318':
  docs: updated Auto training landing page

9 years agoam 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc...
Joe Fernandez [Thu, 19 Mar 2015 05:31:11 +0000 (05:31 +0000)]
am 7e7f3658: am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '7e7f3658b90da46ae8b44577420ebd6ee0e9ffa1':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs...
Joe Fernandez [Thu, 19 Mar 2015 05:31:04 +0000 (05:31 +0000)]
am 7a7f8927: am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '7a7f89271e7fc1a6c3c881a1cb56dc88d9958f7a':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs...
Joe Fernandez [Thu, 19 Mar 2015 05:30:58 +0000 (05:30 +0000)]
am f038ffd7: am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit 'f038ffd7992c5e0c46fb1de6b42e747b1999bfdf':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add...
Joe Fernandez [Thu, 19 Mar 2015 05:24:43 +0000 (05:24 +0000)]
am 2e0f6b10: am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '2e0f6b10e2d0a9d1dc8321e4aaedde148a87bc44':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated...
Joe Fernandez [Thu, 19 Mar 2015 05:24:37 +0000 (05:24 +0000)]
am 1e474aee: am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '1e474aeeb55a3d2ff79b6803813ba36469f3a463':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd...
Joe Fernandez [Thu, 19 Mar 2015 05:24:32 +0000 (05:24 +0000)]
am 6f3caae9: am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit '6f3caae9f016666815d6bfc7daa9db13d13b6cef':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:23:30 +0000 (05:23 +0000)]
am b67971b5: Merge "docs: updated Auto training landing page" into lmp-docs

* commit 'b67971b512d95d5d9befb9d95417f9c3d8cb3a44':
  docs: updated Auto training landing page

9 years agoMerge "docs: updated Auto training landing page" into lmp-docs
Joe Fernandez [Thu, 19 Mar 2015 05:19:21 +0000 (05:19 +0000)]
Merge "docs: updated Auto training landing page" into lmp-docs

9 years agoam 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for Safety...
Joe Fernandez [Thu, 19 Mar 2015 05:18:15 +0000 (05:18 +0000)]
am 9bb7e2e7: am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit '9bb7e2e77c6b8dd3d729cddf23194142cf1035e4':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New...
Joe Fernandez [Thu, 19 Mar 2015 05:18:01 +0000 (05:18 +0000)]
am 1eba366d: am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '1eba366dce4b38e849e9faaf99c5bd3f7de2d6a8':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."

9 years agoam 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs...
Joe Fernandez [Thu, 19 Mar 2015 05:17:54 +0000 (05:17 +0000)]
am 055ec1f9: am f7497b46: am ceb10eac: Merge "Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."" into lmp-docs

* commit '055ec1f94f90bd3f87e0b48d5438953420b22c3f':
  Revert "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785."

9 years agoam f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API....
Joe Fernandez [Thu, 19 Mar 2015 05:11:27 +0000 (05:11 +0000)]
am f23167fc: am 4189bd99: Merge "Revert "Doc change: add docs for SafetyNet API."" into lmp-docs

* commit 'f23167fc8faa03f16a5597acb463393a5ec14af5':
  Revert "Doc change: add docs for SafetyNet API."

9 years agoam 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google...
Joe Fernandez [Thu, 19 Mar 2015 05:11:23 +0000 (05:11 +0000)]
am 507cfedd: am 5a5e6a37: Merge "Revert "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."" into lmp-docs

* commit '507cfedde978dea45cc646fd391c5a12ff55e9cd':
  Revert "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release."