OSDN Git Service

android-x86/frameworks-base.git
10 years agoMerge "Remove icon from base alert dialog, use light theme"
Alan Viverette [Thu, 10 Jul 2014 00:02:28 +0000 (00:02 +0000)]
Merge "Remove icon from base alert dialog, use light theme"

10 years agoRemove icon from base alert dialog, use light theme
Alan Viverette [Wed, 9 Jul 2014 23:15:38 +0000 (16:15 -0700)]
Remove icon from base alert dialog, use light theme

BUG: 16160305
Change-Id: I3cc5b5f0f02ddffb19b06b4796dedb98a6083454

10 years agoam 8e086faf: am 9afee0df: docs: Added missing instructions for copying the Google...
Quddus Chong [Wed, 9 Jul 2014 23:14:57 +0000 (23:14 +0000)]
am 8e086faf: am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project.

* commit '8e086faf89a0c59163731cbe2c7778b7365722ab':
  docs: Added missing instructions for copying the Google Play Services library project.

10 years agoam 9afee0df: docs: Added missing instructions for copying the Google Play Services...
Quddus Chong [Wed, 9 Jul 2014 23:02:01 +0000 (23:02 +0000)]
am 9afee0df: docs: Added missing instructions for copying the Google Play Services library project.

* commit '9afee0df49ce019bf8c8d1c7dc15857949637ccf':
  docs: Added missing instructions for copying the Google Play Services library project.

10 years agodocs: Added missing instructions for copying the Google Play Services library project.
Quddus Chong [Wed, 9 Jul 2014 21:38:04 +0000 (14:38 -0700)]
docs: Added missing instructions for copying the Google Play Services library project.

Change-Id: I04bbfce7e3901a1aa14a3c2a273674014c60ae17

10 years agoMerge "Extend pm to support sessions and split APKs."
Jeff Sharkey [Thu, 10 Jul 2014 00:00:19 +0000 (00:00 +0000)]
Merge "Extend pm to support sessions and split APKs."

10 years agoExtend pm to support sessions and split APKs.
Jeff Sharkey [Tue, 8 Jul 2014 18:28:00 +0000 (11:28 -0700)]
Extend pm to support sessions and split APKs.

Separate commands to create an install session, stream files into the
staging area, and then commit the install.  Streaming can accept data
from stdin across adb, avoiding extra copy from push.

Extend FileBridge to support blocking close().  Always destroy
session regardless of result.

Bug: 14975160
Change-Id: Ic3f462e7d1901079b785e210228950cdfa676466

10 years agoRemove the unnessary log
ztenghui [Wed, 9 Jul 2014 23:46:20 +0000 (16:46 -0700)]
Remove the unnessary log

We still need to investigate the underlying problem and fix it.

bug:16015708

Change-Id: If38b550d5af990d5aaa6633ee129a61e927d66c1

10 years agoAdd versionCode to split manifest; compile.
Jeff Sharkey [Wed, 9 Jul 2014 23:10:16 +0000 (16:10 -0700)]
Add versionCode to split manifest; compile.

To verify consistency at install time, all APK manifests must declare
the same package name and version code.  Also start compiling the
manifest, since versionCode is an attribute.

Bug: 14975160
Change-Id: I2a1a769bd3dfde05b19563af5ca9b6c15a9c95ff

10 years agoMerge "Add an API to disable data reduction proxy."
Selim Gurun [Wed, 9 Jul 2014 23:50:43 +0000 (23:50 +0000)]
Merge "Add an API to disable data reduction proxy."

10 years agoAdd an API to disable data reduction proxy.
Selim Gurun [Wed, 9 Jul 2014 21:40:13 +0000 (14:40 -0700)]
Add an API to disable data reduction proxy.

Bug: 16011253

Under rare circumstances, the application may need to disable the
data reduction proxy. This is to provide a way to do that.

Change-Id: I031f689f9d72460c7241aec78459185e0b31f059

10 years agoMerge "Service for reading and writing blocks to PST partition"
Andres Morales [Wed, 9 Jul 2014 23:37:30 +0000 (23:37 +0000)]
Merge "Service for reading and writing blocks to PST partition"

10 years agoService for reading and writing blocks to PST partition
Andres Morales [Wed, 2 Jul 2014 02:40:41 +0000 (19:40 -0700)]
Service for reading and writing blocks to PST partition

Permits apps with permission
android.permission.ACCESS_PERSISTENT_PARTITION to obtain
a read and write data blocks to the PST partition.

Only one block ever exists at one time in PST. When
a client writes another block, the previous one is
overwritten.

This permits storing a block of data that will live
across factory resets.

Change-Id: I8f23df3531f3c0512118eb4b7530eff8a8e81c83

10 years agoMerge "ActivityManager: pass the main uid of the app to lmkd"
Colin Cross [Wed, 9 Jul 2014 23:09:40 +0000 (23:09 +0000)]
Merge "ActivityManager: pass the main uid of the app to lmkd"

10 years agocamera2: Add NoiseProfile HAL tag.
Ruben Brunk [Wed, 9 Jul 2014 18:30:11 +0000 (11:30 -0700)]
camera2: Add NoiseProfile HAL tag.

Change-Id: Iac1b5b7708222b00a9eb1fb1adc85f0d0a7912cb

10 years agoMerge "Add versionCode to split manifest; compile."
Jeff Sharkey [Wed, 9 Jul 2014 23:49:59 +0000 (23:49 +0000)]
Merge "Add versionCode to split manifest; compile."

10 years agoMerge "Fixing random crash when transitioning to Recents, ensuring we don't update...
Winson Chung [Wed, 9 Jul 2014 21:43:14 +0000 (21:43 +0000)]
Merge "Fixing random crash when transitioning to Recents, ensuring we don't update the TextView unnecessarily."

10 years agoFixing random crash when transitioning to Recents, ensuring we don't update the TextV...
Winson Chung [Wed, 9 Jul 2014 21:29:13 +0000 (14:29 -0700)]
Fixing random crash when transitioning to Recents, ensuring we don't update the TextView unnecessarily.

Change-Id: I93ab512642f6e95ee96e041614f063f46420bb39

10 years agoUnhide the Bluetooth(BLE) offload capability apis
Prerepa Viswanadham [Wed, 9 Jul 2014 21:23:24 +0000 (14:23 -0700)]
Unhide the Bluetooth(BLE) offload capability apis

Change-Id: Ice3f4f5ff4b8318bf6afe7021b253fe9ea4661d3

10 years agoDecouple critical policy power update from SCREEN_ON broadcast
Jim Miller [Wed, 2 Jul 2014 00:10:21 +0000 (17:10 -0700)]
Decouple critical policy power update from SCREEN_ON broadcast

This attempts to fix a bug where ordered broadcasts like
ACTION_SCREEN_ON are substantially delayed by misbehaving
receivers.  Instead, we immediately send the state to mPolicy
so that it can wake/sleep the device without delay.

Fixes bug 14313639

Change-Id: I21a191f90e0a19f1ee75c160ecc4e63e8def709e

10 years agoOnFound and Onlost callback integration
Prerepa Viswanadham [Wed, 9 Jul 2014 19:51:59 +0000 (12:51 -0700)]
OnFound and Onlost callback integration

Change-Id: I23473b18484f041c4dd808c85bb92545a77e20c2

10 years agoUpgraded system apps could be mono or cluster.
Jeff Sharkey [Wed, 9 Jul 2014 20:10:55 +0000 (13:10 -0700)]
Upgraded system apps could be mono or cluster.

Derive old-style paths for monolithic installations, otherwise
assume cluster installation.

Bug: 16163776
Change-Id: I03f1a12f9c07f6177a5c09be2bfe967416c07652

10 years agoFix extraneous allocation and copying
Anish Athalye [Tue, 8 Jul 2014 20:27:14 +0000 (13:27 -0700)]
Fix extraneous allocation and copying

With breaks being allocated the way it was, there were 16 ints with
value 0 being stored in the beginning of the vector. Because of the way
the rest of the code is structured, this did not result in incorrect
operation, but it still wasted time and memory.

Change-Id: Ic0df3e5484417da51f2465ec2d72222fefffc18a

10 years agoam 0d15ec78: am d7880b6a: docs: fix packaging instructions again to reflect correct...
Robert Ly [Wed, 9 Jul 2014 19:35:38 +0000 (19:35 +0000)]
am 0d15ec78: am d7880b6a: docs: fix packaging instructions again to reflect correct metadata name

* commit '0d15ec78286df8bc8372c37fd932680c8ed7a0d7':
  docs: fix packaging instructions again to reflect correct metadata name

10 years agoRemove an obsolete code comment
Svetoslav [Wed, 9 Jul 2014 19:28:13 +0000 (12:28 -0700)]
Remove an obsolete code comment

Change-Id: Ia04f18eb9e9153d46e12219482e84b862e4ec8e6

10 years agounhide SHOW_REGULATORY_INFO intent.
Santos Cordon [Wed, 9 Jul 2014 19:07:51 +0000 (12:07 -0700)]
unhide SHOW_REGULATORY_INFO intent.

Change-Id: If14e6599626f8570087fe56952ac3e9026ec9a94

10 years agoam d7880b6a: docs: fix packaging instructions again to reflect correct metadata name
Robert Ly [Wed, 9 Jul 2014 19:19:54 +0000 (19:19 +0000)]
am d7880b6a: docs: fix packaging instructions again to reflect correct metadata name

* commit 'd7880b6a50aa0dbea66923a4672d360229ab3aca':
  docs: fix packaging instructions again to reflect correct metadata name

10 years agodocs: fix packaging instructions again to reflect correct metadata name
Robert Ly [Wed, 9 Jul 2014 18:45:33 +0000 (11:45 -0700)]
docs: fix packaging instructions again to reflect correct metadata name

Change-Id: I61659811065ad5f0fa8f722f80793e707730604c

10 years agoFix System API build.
Ying Wang [Wed, 9 Jul 2014 19:04:11 +0000 (12:04 -0700)]
Fix System API build.

Change-Id: Iece27eb0be2a83a468fbf6584a1170ec9e20f803

10 years agoMove showCallScreen & isInAPhoneCall to PhoneManager.
Santos Cordon [Mon, 7 Jul 2014 21:53:10 +0000 (14:53 -0700)]
Move showCallScreen & isInAPhoneCall to PhoneManager.

Change-Id: I852da78ae80eba120932fb7acb1e5c3db2a8f18a

10 years agoUpdating task grouping logic.
Winson Chung [Wed, 9 Jul 2014 04:50:31 +0000 (21:50 -0700)]
Updating task grouping logic.

- More fixes for graphical glitches when picking up task views.

Change-Id: I93fab1c2a9cc727c68d8f8fbd506bedaf681715f

10 years agoRefactoring a few things with the full screen overlay and enter animation.
Winson Chung [Tue, 8 Jul 2014 21:39:08 +0000 (14:39 -0700)]
Refactoring a few things with the full screen overlay and enter animation.

- Fixing issue with configuration change triggering enter animation
- Using a proper target task rect when animating into a group

Change-Id: I856d29a663f5e8c000ca22fd1025c09f65032893

10 years agoam 811aeae9: am e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 160626...
Ricardo Cervera [Wed, 9 Jul 2014 18:46:55 +0000 (18:46 +0000)]
am 811aeae9: am e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev

* commit '811aeae95370bcce395e6d2ecafe2d148b50f58c':
  docs: Fixed minor issues with Wear docs. Bug: 16062631

10 years agoam 941fe577: am 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906
Ricardo Cervera [Wed, 9 Jul 2014 18:46:49 +0000 (18:46 +0000)]
am 941fe577: am 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906

* commit '941fe5773508b4dba9062cd61cb0e3d82df59f9f':
  docs: Fixed nav bar color in material docs. Bug: 16160906

10 years agoAdding print preview.
Svet Ganov [Sun, 15 Jun 2014 05:29:00 +0000 (22:29 -0700)]
Adding print preview.

This change adds the pring preview part of the new print UX. The
UI has two parts, the top section is the print options and the
bottom section print preview with a list of pages. The user can
interact only with one of them. When print options are expanded
they cover the preview content and a scrim is laid out on top of
the preview. Tapping the scrim collapses the print options. When
the user types in page ranges and closes the options to look at
the preview, the latter is updated to show only these pages. In
the list of pages the user can further prune pages by deselecting
them.

Change-Id: I0b23d2c598afe2a34400ccfa43e4e935af83c72f

10 years agoam fdefaada: am a0d38aa4: Merge "docs: remove gms core preview for wear and redirect...
Robert Ly [Wed, 9 Jul 2014 18:42:12 +0000 (18:42 +0000)]
am fdefaada: am a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev

* commit 'fdefaadab556bf4919c85ed32e2d0a68f9e6c778':
  docs: remove gms core preview for wear and redirect

10 years agoam e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into...
Ricardo Cervera [Wed, 9 Jul 2014 18:38:20 +0000 (18:38 +0000)]
am e34167ce: Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev

* commit 'e34167cef73e23c4be4bf5d7a1517e609122d652':
  docs: Fixed minor issues with Wear docs. Bug: 16062631

10 years agoam 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906
Ricardo Cervera [Wed, 9 Jul 2014 18:38:16 +0000 (18:38 +0000)]
am 3a958b9f: docs: Fixed nav bar color in material docs. Bug: 16160906

* commit '3a958b9f851a8985bed5fac1499c5553ff566b9e':
  docs: Fixed nav bar color in material docs. Bug: 16160906

10 years agoam a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp...
Robert Ly [Wed, 9 Jul 2014 18:33:49 +0000 (18:33 +0000)]
am a0d38aa4: Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev

* commit 'a0d38aa4e58eee27b561420047d0aafcdaed93f1':
  docs: remove gms core preview for wear and redirect

10 years agodocs: Fixed nav bar color in material docs. Bug: 16160906
Ricardo Cervera [Wed, 9 Jul 2014 16:18:18 +0000 (09:18 -0700)]
docs: Fixed nav bar color in material docs. Bug: 16160906

Change-Id: I56eb7f4d0e9a0a24b1fb38f08dd8ccba6c91dd17

10 years agoActivityManager: pass the main uid of the app to lmkd
Colin Cross [Fri, 13 Jun 2014 21:56:04 +0000 (14:56 -0700)]
ActivityManager: pass the main uid of the app to lmkd

The uid and pid will be used to together to find any forked processes
and kill them.

Bug: 15313911
Change-Id: I2edb51527e5d1a977c0fad0e6c959c8438bb4be9

10 years agoDefer opening a stats session until first use.
John Spurlock [Wed, 9 Jul 2014 18:26:00 +0000 (14:26 -0400)]
Defer opening a stats session until first use.

Bug:16174801
Change-Id: Ia70f9a01bd348809db4ab2992e5e1265778cfcfa

10 years agoam 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"
Robin Lee [Wed, 9 Jul 2014 17:43:56 +0000 (17:43 +0000)]
am 1f0180bf: am 74803e55: Merge "Make misc config directory during user creation"

* commit '1f0180bfa877373b239a5675f715288db829fa75':
  Make misc config directory during user creation

10 years agoam 74803e55: Merge "Make misc config directory during user creation"
Robin Lee [Wed, 9 Jul 2014 17:39:13 +0000 (17:39 +0000)]
am 74803e55: Merge "Make misc config directory during user creation"

* commit '74803e559caffe235b86dc52cf76ef98343c0d74':
  Make misc config directory during user creation

10 years agoam 33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:50:42 +0000 (16:50 +0000)]
am 33f5a318: Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev

* commit '33f5a318b981a69542bfd158e3fec5814135665a':
  docs: surface ui toolkit at a higher level

10 years agoam db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp...
Robert Ly [Wed, 9 Jul 2014 16:28:29 +0000 (16:28 +0000)]
am db520137: Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev

* commit 'db520137dbd67d4b8ec65011accadda7e25ec844':
  docs: fix wear packaging for paid apps instructions

10 years agoam e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:51:13 +0000 (15:51 +0000)]
am e0b5829e: Merge "docs: fix 2d picker image description" into klp-modular-dev

* commit 'e0b5829eb1eac1be768343371da71e7d53d9eff5':
  docs: fix 2d picker image description

10 years agoam 6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:06:37 +0000 (15:06 +0000)]
am 6f52e7be: Merge "docs: fix link to messages doc" into klp-modular-dev

* commit '6f52e7be188781a906cc53dcd96268ffbfdfc283':
  docs: fix link to messages doc

10 years agoMerge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev
Ricardo Cervera [Wed, 9 Jul 2014 18:34:15 +0000 (18:34 +0000)]
Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev

10 years agodocs: Fixed minor issues with Wear docs. Bug: 16062631
Ricardo Cervera [Wed, 9 Jul 2014 17:46:54 +0000 (10:46 -0700)]
docs: Fixed minor issues with Wear docs. Bug: 16062631

Change-Id: Ieaa02cfedd1b9b6f59c6937a056c8d4f4eb4188e

10 years agoMerge "docs: remove gms core preview for wear and redirect" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 18:28:38 +0000 (18:28 +0000)]
Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev

10 years agodocs: remove gms core preview for wear and redirect
Robert Ly [Wed, 9 Jul 2014 16:46:45 +0000 (09:46 -0700)]
docs: remove gms core preview for wear and redirect

Change-Id: I8dd618a8fc99034cd73927d4aa312fe871081f83

10 years agodocs: surface ui toolkit at a higher level
Robert Ly [Wed, 9 Jul 2014 16:42:29 +0000 (09:42 -0700)]
docs: surface ui toolkit at a higher level

Change-Id: If17cebda4606404f13d10ecb1540eda75b5e11ec

10 years agodocs: fix wear packaging for paid apps instructions
Robert Ly [Wed, 9 Jul 2014 16:23:23 +0000 (09:23 -0700)]
docs: fix wear packaging for paid apps instructions

Change-Id: Ibf2cbe2e4bcb7e998665b10c5632c786dcc90e76

10 years agodocs: fix 2d picker image description
Robert Ly [Wed, 9 Jul 2014 15:46:37 +0000 (08:46 -0700)]
docs: fix 2d picker image description

Change-Id: Id554a7090986e71a502dc070468d26f8d546cc2c

10 years agodocs: fix link to messages doc
Robert Ly [Wed, 9 Jul 2014 14:59:07 +0000 (07:59 -0700)]
docs: fix link to messages doc

Change-Id: I382a2ec26634f8d7427344657de0a66b187562cb

10 years agoMerge "Add manage voicemail permission (1/4)"
Yorke Lee [Wed, 9 Jul 2014 18:23:42 +0000 (18:23 +0000)]
Merge "Add manage voicemail permission (1/4)"

10 years agoMerge "docs: surface ui toolkit at a higher level" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:44:09 +0000 (16:44 +0000)]
Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev

10 years agoMerge "docs: fix 2d picker image description" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:48:19 +0000 (15:48 +0000)]
Merge "docs: fix 2d picker image description" into klp-modular-dev

10 years agoMerge "docs: fix link to messages doc" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 15:02:11 +0000 (15:02 +0000)]
Merge "docs: fix link to messages doc" into klp-modular-dev

10 years agoam 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [framewo...
Brian Carlstrom [Wed, 9 Jul 2014 12:36:47 +0000 (12:36 +0000)]
am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit '5aba0149b953fb8e85851811dde995fb35c10051':
  Make dex2oat heap size product configurable [frameworks/base]

10 years agoam b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"
Brian Carlstrom [Wed, 9 Jul 2014 12:21:54 +0000 (12:21 +0000)]
am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]

10 years agoam d3a77b16: am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e34469...
Deepanshu Gupta [Wed, 9 Jul 2014 00:06:22 +0000 (00:06 +0000)]
am d3a77b16: am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'd3a77b16c7e0cd54cde9a855654fe02897a50b87':
  Change font family name. [DO NOT MERGE]

10 years agoam e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b48760...
Deepanshu Gupta [Wed, 9 Jul 2014 00:02:06 +0000 (00:02 +0000)]
am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'e7ef4dde3cd9a9b7f6e8317563158b954ca679be':
  Change font family name. [DO NOT MERGE]

10 years agoam d9843b2e: Merge "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp...
David Friedman [Wed, 9 Jul 2014 00:01:55 +0000 (00:01 +0000)]
am d9843b2e: Merge "Change list for NDK Revision 10. Staged at: boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html" into klp-modular-dev

* commit 'd9843b2ebeb9a99b620aae3a3d17ea64fb00358a':
  Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html

10 years agoam 9f595d98: am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce845...
Deepanshu Gupta [Wed, 9 Jul 2014 00:01:51 +0000 (00:01 +0000)]
am 9f595d98: am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '9f595d98979151860d76516f37bcc47238370f44':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours...
Deepanshu Gupta [Tue, 8 Jul 2014 23:57:43 +0000 (23:57 +0000)]
am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '575e334d1d132321155d9afddc5733cfd5e58b2d':
  Change font family name. [DO NOT MERGE]

10 years agoam 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e5407...
Deepanshu Gupta [Tue, 8 Jul 2014 23:54:06 +0000 (23:54 +0000)]
am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '6077f5f2340a26954033c5e1724506efbe478fba':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb...
Deepanshu Gupta [Tue, 8 Jul 2014 23:52:33 +0000 (23:52 +0000)]
am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '813e2ac3a03aec7052f1d9fcd2f53ef51493374c':
  Change font family name. [DO NOT MERGE]

10 years agoam 6dfce3f7: am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f...
Deepanshu Gupta [Tue, 8 Jul 2014 23:50:15 +0000 (23:50 +0000)]
am 6dfce3f7: am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '6dfce3f72c6e315013e323f4c1bb918c449d7d61':
  Change font family name. [DO NOT MERGE]

10 years agoam 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours...
Deepanshu Gupta [Tue, 8 Jul 2014 23:50:09 +0000 (23:50 +0000)]
am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '2e9dc1fe510ae2c41bdd7415e9fc1c903ebfa336':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fd...
Deepanshu Gupta [Tue, 8 Jul 2014 23:48:14 +0000 (23:48 +0000)]
am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'bda28629dd2be00c1fda9a09192aef17f44fc919':
  Change font family name. [DO NOT MERGE]

10 years agoam 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92...
Deepanshu Gupta [Tue, 8 Jul 2014 23:45:05 +0000 (23:45 +0000)]
am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '4b84593f8b34ecb16cf9ff413d0e4f3d14f0e422':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change...
Deepanshu Gupta [Tue, 8 Jul 2014 23:43:39 +0000 (23:43 +0000)]
am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '1e34469469fca5770f9c5f811b592d1f3687ddc5':
  Change font family name. [DO NOT MERGE]

10 years agoam 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change...
Deepanshu Gupta [Tue, 8 Jul 2014 23:41:59 +0000 (23:41 +0000)]
am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '00a1033408407bce5997e81165ffea35844786a1':
  Change font family name. [DO NOT MERGE]

10 years agoam b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc...
Deepanshu Gupta [Tue, 8 Jul 2014 23:39:43 +0000 (23:39 +0000)]
am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b0470a1fce9e496b4812e8d652db20b8af656c02':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family...
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:48 +0000 (23:38 +0000)]
am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '0b4876043be6eb9c2eaccb8270370b9275d4d899':
  Change font family name. [DO NOT MERGE]

10 years agoam c295c08f: am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e...
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:26 +0000 (23:38 +0000)]
am c295c08f: am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'c295c08fb4d08e4f335754aa62ff0d957a339109':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family...
Deepanshu Gupta [Tue, 8 Jul 2014 23:36:50 +0000 (23:36 +0000)]
am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '931e049e6566723027554e57905de109b6faa783':
  Change font family name. [DO NOT MERGE]

10 years agoam d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge...
Deepanshu Gupta [Tue, 8 Jul 2014 23:35:09 +0000 (23:35 +0000)]
am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd7ce84528da16ef53eb8e3c9f34a5c7ca90fd1b3':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a...
Deepanshu Gupta [Tue, 8 Jul 2014 23:34:08 +0000 (23:34 +0000)]
am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'efa0e90cc581a9bbef9ae15ce8f1b6780c1c4bfe':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:33:00 +0000 (23:33 +0000)]
am 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '61d3dea672ed8f2f4f90860580c37766b0197a58':
  Change font family name. [DO NOT MERGE]

10 years agoam 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT...
Deepanshu Gupta [Tue, 8 Jul 2014 23:32:12 +0000 (23:32 +0000)]
am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '5414f83d38455fcd8c788ea1b5cf61aaef3d0a5d':
  Change font family name. [DO NOT MERGE]

10 years agoMerge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev
Robert Ly [Wed, 9 Jul 2014 16:25:05 +0000 (16:25 +0000)]
Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev

10 years agoam d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:30:20 +0000 (23:30 +0000)]
am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'd53a9fcb7c56d6495e88cc3e39e2892e449a9171':
  Change font family name. [DO NOT MERGE]

10 years agoam 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script...
Deepanshu Gupta [Tue, 8 Jul 2014 23:30:10 +0000 (23:30 +0000)]
am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '10e540733416a94206a656ce749fa046ab3e7655':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:29:03 +0000 (23:29 +0000)]
am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
  Change font family name. [DO NOT MERGE]

10 years agoam e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename...
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:41 +0000 (23:28 +0000)]
am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'e63b7ad391effb405712647f761402ce15d0ea48':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:32 +0000 (23:28 +0000)]
am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE]

* commit 'd2829b490989b595118c7bd17c1dbff6789cacaa':
  Change font family name. [DO NOT MERGE]

10 years agoam ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK...
Deepanshu Gupta [Tue, 8 Jul 2014 23:26:15 +0000 (23:26 +0000)]
am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'ca82da92db2949f134af01f577167639cbfc79bc':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:25:22 +0000 (23:25 +0000)]
am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit '979f9c685e31a07e9bd1d89c0947b863dd456940':
  Change font family name. [DO NOT MERGE]

10 years agoam 432d16f9: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:17 +0000 (23:24 +0000)]
am 432d16f9: Change font family name. [DO NOT MERGE]

* commit '432d16f97adab9d845904e25b50671cf35cfb628':
  Change font family name. [DO NOT MERGE]

10 years agoam 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for...
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:15 +0000 (23:24 +0000)]
am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit '5acf782c6822bf6c1b24d3582f52d65a949912f6':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 8e11659a: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:05 +0000 (23:24 +0000)]
am 8e11659a: Change font family name. [DO NOT MERGE]

* commit '8e11659a43b34d465deb631575425b1706547dcc':
  Change font family name. [DO NOT MERGE]

10 years agoam e30d3fdd: Change font family name. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:23:21 +0000 (23:23 +0000)]
am e30d3fdd: Change font family name. [DO NOT MERGE]

* commit 'e30d3fdd04840bfd90a172492edcacffeeea81da':
  Change font family name. [DO NOT MERGE]

10 years agoam 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE...
Deepanshu Gupta [Tue, 8 Jul 2014 23:21:34 +0000 (23:21 +0000)]
am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5d0db7f2ff4a16a40bbdba9b1ae9b4434554bced':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:19:46 +0000 (23:19 +0000)]
am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'd751eed44bcb28461dc853df08b89e5bc8ab6f60':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb...
Deepanshu Gupta [Tue, 8 Jul 2014 23:17:22 +0000 (23:17 +0000)]
am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '5455ddc48fc31faea739a21cb46bda04bf36bb92':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoam b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:15:39 +0000 (23:15 +0000)]
am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE]

* commit 'b49e21e153c59b31503a376d62257e4fc6e7ce4f':
  Add a script to rename fonts for SDK. [DO NOT MERGE]

10 years agoChange font family name. [DO NOT MERGE]
Deepanshu Gupta [Sat, 28 Jun 2014 01:39:32 +0000 (18:39 -0700)]
Change font family name. [DO NOT MERGE]

During the SDK build, rename the Font's Family name and not just the
PS Name. Updating the PS name doesn't work.

Change-Id: I997b5eec9f493ce97b95c33101ee426e773890c1
(cherry picked from commit 24f58dbce27f8fa56de992d0c03168a88ae80bad)